Fix #1256, add rtems 6 support #1257
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
marked this pull request as ready for review
ghost
added
the
CCB:Ready
skliper
approved these changes
May 23, 2022
astrogeco
removed
the
CCB:Ready
|
CCB:2022-05-25 APPROVED
|
astrogeco
added
the
CCB:Approved
jphickey
approved these changes
May 25, 2022
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
May 31, 2022
nasa/osal#1257, add rtems 6 support Co-authored-by: Jacob Hageman <[email protected]> Co-authored-by: Alan Cudmore <[email protected]>
This was referenced May 31, 2022
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
May 31, 2022
*cFE v7.0.0-rc4+dev136* (nasa/cFE#2111) - nasa/cFE#2105, Resolve static analysis warnings - nasa/cFE#2108, cFE_Users_guide.pdf 404 *osal v6.0.0-rc4+dev83* (nasa/osal#1260) - nasa/osal#1255, Resolve static analysis warnings - nasa/osal#1257, add rtems 6 support *psp v1.6.0-rc4+dev38* (nasa/PSP#346) - nasa/PSP#344, Resolve uninit var static analysis warning *elf2cfetbl v3.3.0-rc4+dev24* (nasa/elf2cfetbl#113) - nasa/elf2cfetbl#112, Resolve uninit var static analysis warnings *sch_lab v2.5.0-rc4+dev29* (nasa/sch_lab#116) - nasa/sch_lab#115, Resolve uninit var static analysis warnings
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
May 31, 2022
**Combines** *cFE v7.0.0-rc4+dev136* (nasa/cFE#2111) - nasa/cFE#2108, cFE_Users_guide.pdf 404 *osal v6.0.0-rc4+dev83* (nasa/osal#1260) - nasa/osal#1257, add rtems 6 support *psp v1.6.0-rc4+dev38* (nasa/PSP#346) *elf2cfetbl v3.3.0-rc4+dev24* (nasa/elf2cfetbl#113) *sch_lab v2.5.0-rc4+dev29* (nasa/sch_lab#116) *Resolve Static Analysis Warnings* nasa/cFE#2105, Resolve static analysis warnings nasa/osal#1255, Resolve static analysis warnings nasa/PSP#344, Resolve uninit var static analysis warning nasa/sch_lab#115, Resolve uninit var static analysis warnings nasa/elf2cfetbl#112, Resolve uninit var static analysis warnings Co-authored-by: Paul Ober <[email protected]> Co-authored-by: Jacob Hageman <[email protected]> Co-authored-by: Alan Cudmore <[email protected]>
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
May 31, 2022
**Combines** *cFE v7.0.0-rc4+dev136* (nasa/cFE#2111) - nasa/cFE#2108, cFE_Users_guide.pdf 404 *osal v6.0.0-rc4+dev83* (nasa/osal#1260) - nasa/osal#1257, add rtems 6 support *psp v1.6.0-rc4+dev38* (nasa/PSP#346) *elf2cfetbl v3.3.0-rc4+dev24* (nasa/elf2cfetbl#113) *sch_lab v2.5.0-rc4+dev29* (nasa/sch_lab#116) *Resolve Static Analysis Warnings* nasa/cFE#2105, Resolve static analysis warnings nasa/osal#1255, Resolve static analysis warnings nasa/PSP#344, Resolve uninit var static analysis warning nasa/sch_lab#115, Resolve uninit var static analysis warnings nasa/elf2cfetbl#112, Resolve uninit var static analysis warnings Co-authored-by: Paul Ober <[email protected]> Co-authored-by: Jacob Hageman <[email protected]> Co-authored-by: Alan Cudmore <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist (Please check before submitting)
Describe the contribution
These changes add support for RTEMS 6 in the RTEMS OSAL and pc-rtems OSAL BSP. The changes consist of modifications to the conditional compilation blocks and a couple of new conditional compilation blocks in the pc-rtems OSAL BSP startup code to account for an include and API that was deprecated in RTEMS 6.
In the RTEMS OSAL, the existing conditional compilation blocks were flipped from:
to:
By flipping the blocks as described above, it should work with future versions of RTEMS provided the API does not change.
There is also a change in the os-impl-loader.c file to solve a warning with GCC 12. GCC 12 is now used by RTEMS 6.
Testing performed
All tests were run on the QEMU RTEMS 4.11, QEMU RTEMS 5, and the new QEMU RTEMS 6 containers.
Expected behavior changes
There should be no impact to the behavior. All tests passed on RTEMS 4.11, 5, and 6.
System(s) tested on
QEMU x86 with pc-rtems RTEMS BSP and cFS pc-rtems platform. In addition these changes are being used on a generic-rtems platform that will be submitted in a future PR.
Additional context
This is the last set of code changes in the first round of RTEMS 6 updates described here:
nasa/cFS#468
Third party code
None
Contributor Info - All information REQUIRED for consideration of pull request
Alan Cudmore, NASA/GSFC Code 582.0